projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 191a9d5) | patch
Work around git 2.50 bug that caused it to crash when there is a merge conflict with...
authorJoey Hess <joeyh@joeyh.name>
Wed, 25 Jun 2025 17:36:19 +0000 (13:36 -0400)
committerSean Whitton <spwhitton@spwhitton.name>
Tue, 1 Jul 2025 10:23:12 +0000 (11:23 +0100)
commit892869805104d1e3237d640dcd75508380062a28
treeaf4296000c972c5c3c5c73a206845ee6b5394a6ctree | snapshot
parent191a9d5bbb8dc1aa10a6191ba95ca4582c5ddf71commit | diff
Work around git 2.50 bug that caused it to crash when there is a merge conflict with an unlocked annexed file

This fixes several test suite failures with git 2.50.

See the bug report for the full, gory details.

(cherry picked from commit fb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af)
Database/Keys.hs diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.